From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Tue, 3 May 2011 17:22:06 +0000 (-0400)
Subject: dash: during drag, only offer trash can when dragging favorites
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8218
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=019670b5ab9287901ca1bc3ac086c6a9f83d90be;p=gnome-shell.git

dash: during drag, only offer trash can when dragging favorites

We should only show the trash can when the user starts dragging a
favorite from the dash, not when the user starts dragging an application
that happens to be a favorite via a window or an application icon
in the applications view.

https://bugzilla.gnome.org/show_bug.cgi?id=642895
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index af9f1b46c..10f1408fa 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -342,7 +342,10 @@ Dash.prototype = {
 
         let srcIsFavorite = (id in favorites);
 
-        if (srcIsFavorite && this._favRemoveTarget == null) {
+        if (srcIsFavorite &&
+            dragEvent.source.actor &&
+            this.actor.contains (dragEvent.source.actor) &&
+            this._favRemoveTarget == null) {
                 this._favRemoveTarget = new RemoveFavoriteIcon();
                 this._favRemoveTarget.icon.setIconSize(this.iconSize);
                 this._box.add(this._favRemoveTarget.actor);